merge with xen-ia64-unstable.hg
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Sat, 18 Mar 2006 09:59:11 +0000 (10:59 +0100)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Sat, 18 Mar 2006 09:59:11 +0000 (10:59 +0100)
commited87d736e930025c4482d0b6e435189bbbfbbf4e
treeae90d7b73bdcbcad9355a4a4aa1fd52b60341ccc
parentb6144da6bbbb219990a78310ae0a1703da26ce94
parentce0bcf0e6433a5d1bf86adf78433ac2840e8ec60
merge with xen-ia64-unstable.hg